From: Marek Marczykowski <marmarek@mimuw.edu.pl>
Date: Mon, 27 Jun 2011 16:34:01 +0000 (+0100)
Subject: xen.lowlevel.xl: Return None on empty domain name
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10123
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ea522a3de7859e1a2f2685256ff4074fa7dc1c87;p=xen.git

xen.lowlevel.xl: Return None on empty domain name

Previously PyString_FromString(NULL) was called, which caused assertion
failure.

Signed-off-by: Marek Marczykowski <marmarek@mimuw.edu.pl>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/python/xen/lowlevel/xl/xl.c b/tools/python/xen/lowlevel/xl/xl.c
index 051b5eb476..b33fb94526 100644
--- a/tools/python/xen/lowlevel/xl/xl.c
+++ b/tools/python/xen/lowlevel/xl/xl.c
@@ -409,13 +409,14 @@ static PyObject *pyxl_domid_to_name(XlObject *self, PyObject *args)
 {
     char *domname;
     int domid;
-    PyObject *ret;
+    PyObject *ret = Py_None;
 
     if ( !PyArg_ParseTuple(args, "i", &domid) )
         return NULL;
 
     domname = libxl_domid_to_name(self->ctx, domid);
-    ret = PyString_FromString(domname);
+    if (domname)
+        ret = PyString_FromString(domname);
     free(domname);
 
     return ret;